Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 21:34:22 +0000 (14:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 21:34:22 +0000 (14:34 -0700)
commitb928c14f428a23f956d92c999cc9b25beb9c9b25
tree866d4392d011563a432a5d5b0ff4d16264014e5d
parent38df6b5b246e8cfe5d0c781459bccdcf37fe2379
parent493c2adc73794267cfc18a5dd8ef71204652e039
Merge from trunk.
ChangeLog